Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Jan 2011 00:33:24 +0000 (16:33 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Jan 2011 00:33:24 +0000 (16:33 -0800)
commit9b68a0707e3f965d2bc9ec2c4cf43c422dfdbd1a
treeb200b45b882dabb5b581d1d1ade9c3ddbec1ba52
parente8e41b7b6e7e5cab32a0ef27a6f9e143f71cedfa
parent71ddbab17d3ab84092943e7f30d0371a3fb8f080
Merge from mainline.